From: Øyvind Kolås <pippin@gimp.org>
Date: Tue, 27 Nov 2018 19:41:23 +0000 (+0100)
Subject: babl: harmonize order of fields in image/model/format
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~12^2~36
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2313351af976798db2aaea0f3b8cfa7dcc383511;p=babl.git

babl: harmonize order of fields in image/model/format
---

diff --git a/babl/babl-format.h b/babl/babl-format.h
index b3a4643..9ebdcec 100644
--- a/babl/babl-format.h
+++ b/babl/babl-format.h
@@ -28,13 +28,13 @@ typedef struct
   int              components;
   BablComponent  **component;
   BablType       **type;
-  void            *model_data;
+  BablModel       *model;
   const Babl      *space;
+  void            *model_data;
   void            *image_template; /* image template for use with
                                       linear (non-planer) images */
 
   BablSampling   **sampling;
-  BablModel       *model;
   int              bytes_per_pixel;
   int              planar;
   double           loss; /*< average relative error when converting
diff --git a/babl/babl-image.h b/babl/babl-image.h
index ea7d05a..c20c06e 100644
--- a/babl/babl-image.h
+++ b/babl/babl-image.h
@@ -48,10 +48,10 @@ typedef struct
 {
   BablInstance    instance;
   BablFormat     *format;    /*< (if known) */
-  BablModel      *model;     /*< (always known) */
   int             components;
   BablComponent **component;
   BablType      **type;
+  BablModel      *model;     /*< (always known) */
   BablSampling  **sampling;
   char          **data;
   int            *pitch;